From: Kenichi Handa <handa@m17n.org>
Date: Thu, 15 Dec 2011 07:51:01 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~86
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6080e055498c19ebd34495f204a8ad676eb09260;p=emacs.git

merge trunk
---

6080e055498c19ebd34495f204a8ad676eb09260